From e9d47e9516637b59f62d7ac6e1b8ade00e8464d6 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 18 Oct 2017 02:50:49 +0800 Subject: [PATCH] Run the gsk tests for both cairo and vulkan The vulkan tests fail currently. --- testsuite/gsk/meson.build | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/testsuite/gsk/meson.build b/testsuite/gsk/meson.build index b16d074c3b..77023d1953 100644 --- a/testsuite/gsk/meson.build +++ b/testsuite/gsk/meson.build @@ -1,9 +1,3 @@ -test_env = environment() -test_env.set('G_TEST_SRCDIR', meson.current_source_dir()) -test_env.set('G_TEST_BUILDDIR', meson.current_build_dir()) -test_env.set('GSETTINGS_BACKEND', 'memory') -test_env.set('G_ENABLE_DIAGNOSTIC', '0') - test_render_nodes = executable( 'test-render-nodes', ['test-render-nodes.c', @@ -11,7 +5,23 @@ test_render_nodes = executable( dependencies: libgtk_dep, ) -test('test-render-nodes', test_render_nodes, suite: 'gsk', env: test_env) +cairo_test_env = environment() +cairo_test_env.set('G_TEST_SRCDIR', meson.current_source_dir()) +cairo_test_env.set('G_TEST_BUILDDIR', meson.current_build_dir()) +cairo_test_env.set('GSETTINGS_BACKEND', 'memory') +cairo_test_env.set('G_ENABLE_DIAGNOSTIC', '0') +cairo_test_env.set('GSK_RENDERER', 'cairo') + +test('nodes (cairo)', test_render_nodes, suite: 'gsk', env: cairo_test_env) + +vulkan_test_env = environment() +vulkan_test_env.set('G_TEST_SRCDIR', meson.current_source_dir()) +vulkan_test_env.set('G_TEST_BUILDDIR', meson.current_build_dir()) +vulkan_test_env.set('GSETTINGS_BACKEND', 'memory') +vulkan_test_env.set('G_ENABLE_DIAGNOSTIC', '0') +vulkan_test_env.set('GSK_RENDERER', 'vulkan') + +test('nodes (vulkan)', test_render_nodes, suite: 'gsk', env: vulkan_test_env) test_data = [ 'blendmode.node', -- 2.30.2